Merge
authorTim Deegan <tim.deegan@xensource.com>
Thu, 5 Oct 2006 15:48:28 +0000 (16:48 +0100)
committerTim Deegan <tim.deegan@xensource.com>
Thu, 5 Oct 2006 15:48:28 +0000 (16:48 +0100)

Trivial merge